Cleanups

diff --git a/ChangeLog b/ChangeLog
index bb564c0b535b93fb10ec8d380dc55cadd38990a3..09358891604bd66adf4b3a1f66f5ab31a290fe4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkitemfactory.[hc]: Don't unnecessarily use 
+       GTK_COMPILATION.
+
        * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the
        XKB event details we actually care about.  (#346079, Ryan Lortie)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb564c0b535b93fb10ec8d380dc55cadd38990a3..09358891604bd66adf4b3a1f66f5ab31a290fe4b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkitemfactory.[hc]: Don't unnecessarily use 
+       GTK_COMPILATION.
+
        * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Only select the
        XKB event details we actually care about.  (#346079, Ryan Lortie)
 

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 9573fd7d6cea9b1d771be5e094f3c8b93d15dd3d..98145a9c7f6c2c60d3f6df92edd6ec923094ae35 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -29,20 +29,23 @@
 
 #include       <config.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #include       "gtkitemfactory.h"
-#include       "gtk/gtkmenubar.h"
-#include       "gtk/gtkmenu.h"
-#include       "gtk/gtkmenuitem.h"
-#include       "gtk/gtkradiomenuitem.h"
-#include       "gtk/gtkcheckmenuitem.h"
-#include       "gtk/gtkimagemenuitem.h"
-#include       "gtk/gtktearoffmenuitem.h"
-#include       "gtk/gtkaccelmap.h"
-#include       "gtk/gtkaccellabel.h"
+#include       "gtkoptionmenu.h"
+#define GTK_DISABLE_DEPRECATED
+#include       "gtkmenubar.h"
+#include       "gtkmenu.h"
+#include       "gtkmenuitem.h"
+#include       "gtkradiomenuitem.h"
+#include       "gtkcheckmenuitem.h"
+#include       "gtkimagemenuitem.h"
+#include       "gtktearoffmenuitem.h"
+#include       "gtkaccelmap.h"
+#include       "gtkaccellabel.h"
 #include        "gdk/gdkkeysyms.h"
-#include       "gtk/gtkimage.h"
-#include       "gtk/gtkstock.h"
-#include       "gtk/gtkiconfactory.h"
+#include       "gtkimage.h"
+#include       "gtkstock.h"
+#include       "gtkiconfactory.h"
 #include       "gtkintl.h"
 #include       <string.h>
 #include       <fcntl.h>
@@ -51,9 +54,6 @@
 #endif
 #include       <stdio.h>
 
-#undef GTK_DISABLE_DEPRECATED
-#include       "gtk/gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 #include       "gtkalias.h"
 
 /* --- defines --- */

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 5cae6892a719b930909ebbe185673ffa3376d9c8..f0d1e4fcbaa72111a5eac78311e867dcc9572313 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 typedef gchar * (*GtkTranslateFunc)       (const gchar         *path,
                                            gpointer             func_data);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+#if !defined (GTK_DISABLE_DEPRECATED)
 
 typedef void   (*GtkPrintFunc)            (gpointer             func_data,
                                            const gchar         *str);
@@ -231,7 +231,7 @@ void        gtk_item_factory_create_menu_entries (guint              n_entries,
 void   gtk_item_factories_path_delete     (const gchar         *ifactory_path,
                                            const gchar         *path);
 
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#endif /* !GTK_DISABLE_DEPRECATED */
 
 
 G_END_DECLS